Merge branch 'master' into feature/constantq
authorPaul Brossier <piem@piem.org>
Mon, 26 Nov 2018 21:33:30 +0000 (22:33 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 26 Nov 2018 21:33:30 +0000 (22:33 +0100)

Trivial merge