Backports nifty8 -> nifty7

Merged Philipp Arras requested to merge backports into NIFTy_7

Otherwise it cannot be run on other machines

Edited by Philipp Arras

Merge request reports