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

5 jobs for master in 5 minutes and 27 seconds