Merge branch 'feature/travispy37'
authorPaul Brossier <piem@piem.org>
Wed, 26 Sep 2018 13:03:11 +0000 (15:03 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 26 Sep 2018 13:03:11 +0000 (15:03 +0200)

Trivial merge