Merge branch 'master' into coveralls
authorPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 15:41:35 +0000 (17:41 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 15:41:35 +0000 (17:41 +0200)

Trivial merge