Backports nifty8 -> nifty7

Philipp Arrasrequested to merge
backports into NIFTy_7

Otherwise it cannot be run on other machines

Edited by Philipp Arras

Merge request reports