Merge branch 'master' into pitchshift
authorPaul Brossier <piem@piem.org>
Wed, 21 Sep 2016 13:47:48 +0000 (15:47 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 21 Sep 2016 13:47:48 +0000 (15:47 +0200)

Trivial merge