issue #822 fixed (1st of the 3 choices)
Merge branch 'master' of github.com:CellProfiler/CellProfiler