Merge branch 'master' into pitchshift
authorPaul Brossier <piem@piem.org>
Tue, 20 Sep 2016 23:49:22 +0000 (01:49 +0200)
committerPaul Brossier <piem@piem.org>
Tue, 20 Sep 2016 23:49:22 +0000 (01:49 +0200)

Trivial merge