Merge branch 'master' into coveralls
authorPaul Brossier <piem@piem.org>
Sun, 17 Sep 2017 13:10:32 +0000 (15:10 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 17 Sep 2017 13:10:32 +0000 (15:10 +0200)

Trivial merge