issue #730 fix
Merge branch 'master' of github.com:CellProfiler/CellProfiler