Merge branch 'master' into feature/constantq
authorPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 11:20:00 +0000 (13:20 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 11:20:00 +0000 (13:20 +0200)

Trivial merge