Merge branch 'master' into manual
Merge branch 'manual' of https://github.com/mpip/pfft into manual