Merge branch 'master' into timestretch
authorPaul Brossier <piem@piem.org>
Fri, 30 Sep 2016 12:55:31 +0000 (14:55 +0200)
committerPaul Brossier <piem@piem.org>
Fri, 30 Sep 2016 12:55:31 +0000 (14:55 +0200)

Trivial merge