merge NIFTy_4

3 jobs for working_on_demos in 4 minutes and 21 seconds