Fix for the 'showGrid' option.
Merge branch 'develop'