issue #924 issue #917
Merge branch 'master' of git://github.com/CellProfiler/CellProfiler