Merge branch 'master' into feature/sink_vorbis
authorPaul Brossier <piem@piem.org>
Mon, 17 Dec 2018 14:44:16 +0000 (15:44 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 17 Dec 2018 14:44:16 +0000 (15:44 +0100)

Trivial merge