Merge branch 'NIFTy_7' into restructure_tensors

12 jobs for restructure_tensors in 11 minutes and 17 seconds (queued for 4 seconds)