Merge branch 'circlei'
authorPaul Brossier <piem@piem.org>
Thu, 16 Mar 2017 23:26:42 +0000 (00:26 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 16 Mar 2017 23:26:42 +0000 (00:26 +0100)

Trivial merge