Merge branch 'patches/marcus/fftw'