Merge branch 'master' into feature/pitchshift
authorPaul Brossier <piem@piem.org>
Thu, 6 Dec 2018 12:51:35 +0000 (13:51 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 6 Dec 2018 12:51:35 +0000 (13:51 +0100)

Trivial merge