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

5 jobs for master in 25 minutes and 7 seconds (queued for 1 second)