Merge remote-tracking branch 'origin/feature/10102_rebin_by_t_at_sample'
Re #10133. Making sphinx 1.2 the only version that matters.
Merge branch 'feature/10133_sphinx_check' into develop