Merge pull request #1446 from Gimly/master

Fixed templating issues when the DataGrid has SelectionUnit=Cell