Catch a NaN before outlier calculation (DAWNSCI-580)
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git