Merge branch 'feature/circleci2'
authorPaul Brossier <piem@piem.org>
Thu, 4 Oct 2018 23:17:18 +0000 (01:17 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 4 Oct 2018 23:17:18 +0000 (01:17 +0200)

Trivial merge