Merge branch 'master' into feature/autosink
authorPaul Brossier <piem@piem.org>
Thu, 9 May 2019 17:48:01 +0000 (19:48 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 9 May 2019 17:48:01 +0000 (19:48 +0200)

Trivial merge