Merge branch 'NIFTy_4' of https://gitlab.mpcdf.mpg.de/ift/NIFTy into NIFTy_4

forgot to pull before changes
6 jobs for NIFTy_4 in 14 minutes and 44 seconds (queued for 2 seconds)