Merge branch 'NIFTy_4' into cleanupsInEnergyClasses

1 job for cleanupsInEnergyClasses in 11 minutes and 55 seconds (queued for 1 second)