Fix #25 but not #4.
Merge branch 'master' of github.com:CellProfiler/CellProfiler-Analyst