issue #625 fixed
Merge branch 'master' of github.com:CellProfiler/CellProfiler