Merge pull request #5038 from Wedmer/fftw_3_3_7