merge

12 jobs for NIFTy_7 in 13 minutes and 42 seconds (queued for 3 seconds)