issue #892 fix + test and another tweak for issue #889 (broke it for black & white)
Merge branch 'master' of github.com:CellProfiler/CellProfiler