Merge branch 'master' into fftw_for_the_masses

# Conflicts:
#	test/test_spaces/test_power_space.py
4 jobs for fftw_for_the_masses in 5 minutes and 19 seconds (queued for 1 second)