Issue #695 pad with NaN as stopgap
Merge branch '2_0_bugfix' of github.com:CellProfiler/CellProfiler into 2_0_bugfix