Merge branch 'master' into yinfft+ yinfft+
authorPaul Brossier <piem@piem.org>
Thu, 2 Feb 2017 01:39:25 +0000 (02:39 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 2 Feb 2017 01:39:25 +0000 (02:39 +0100)

Trivial merge