Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy

# Conflicts:
#	nifty/operators/probing_operator/__init__.py
#	nifty/operators/probing_operator/diagonal_prober.py
#	nifty/operators/probing_operator/trace_prober.py
5 jobs for master in 54 minutes and 25 seconds (queued for 14 minutes and 18 seconds)
Status Name Job ID Coverage
  Test
passed test_min #120262

00:04:36

passed test_mpi #120263

00:07:44

passed test_mpi_fftw #120264

00:13:54

passed test_mpi_fftw_hdf5 #120265

00:10:35

27.0%
 
  Release
passed release_image_master #120266

00:25:17