Merge branch 'master' into feature/constantq
authorPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 19:58:02 +0000 (21:58 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 19:58:02 +0000 (21:58 +0200)

Trivial merge