Merge branch 'NIFTy_5' into fix_doc

9 jobs for fix_doc in 8 minutes and 24 seconds (queued for 1 second)