Re #10841 This should fix it
Re #10841 Conflicts with develp

Merge branch 'bugfix/10841_BinningCanBeNone' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/Direct/NonIDF_Properties.py