Merge branch 'master' into 'harmonic_inference.py'

# Conflicts:
#   nifty/sugar.py
4 jobs for harmonic_inference.py in 6 minutes and 9 seconds
Status Name Job ID Coverage
  Test
passed test_min #164919

00:01:49

passed test_mpi #164920

00:03:25

passed test_mpi_fftw #164921

00:03:54

passed test_mpi_fftw_hdf5 #164922

00:04:19

47.0%