issue #694 should be largely useable
Merge branch 'master' of github.com:CellProfiler/CellProfiler