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

11 jobs for master in 25 minutes and 35 seconds (queued for 13 minutes and 55 seconds)