Merge branch 'master' into fftw_for_the_masses

4 jobs for fftw_for_the_masses in 5 minutes and 5 seconds (queued for 1 second)