Merge branch 'NIFTy_6' into concise_offset_parametrization

9 jobs for concise_offset_parametrization in 19 minutes and 33 seconds (queued for 1 second)