Issue #945 Block 4 - Grid Editor
Merge pull request #952 from pecko/issue945c

Issue #945 Block 4 - Grid Editor