Merge branch 'master' into feature/fastmfcc
authorPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 15:34:21 +0000 (17:34 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 15:34:21 +0000 (17:34 +0200)

Trivial merge