Fixing the Windows builds. Re #863
Merge branch 'feature/863_reflectometry_fitting' into develop