Merge branch 'master' into feature/autosink
authorPaul Brossier <piem@piem.org>
Wed, 19 Dec 2018 13:58:09 +0000 (14:58 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 19 Dec 2018 13:58:09 +0000 (14:58 +0100)

Trivial merge