Merge branch 'master' into yinfft+
authorPaul Brossier <piem@piem.org>
Wed, 1 Feb 2017 21:54:35 +0000 (22:54 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 1 Feb 2017 21:54:35 +0000 (22:54 +0100)

Trivial merge