Merge branch 'master' into feature/constantq
authorPaul Brossier <piem@piem.org>
Wed, 21 Nov 2018 12:00:47 +0000 (13:00 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 21 Nov 2018 12:00:47 +0000 (13:00 +0100)

Trivial merge