#866: Typo
Defensive coding for issue #899 + test
Merge branch 'master' of github.com:CellProfiler/CellProfiler