Master

Merged Theo Steininger requested to merge master into NIFTy_1

Merge request reports