issue #984 i love the mac it's so nice and shiny!
Merge branch 'master' of github.com:CellProfiler/CellProfiler