Fix broken build
Merge branch 'multiprocessing' of github.com:CellProfiler/CellProfiler into multiprocessing