fix for #2263
fix for #2261
Merge branch 'master' of https://github.com/angular-ui/ng-grid
Merge pull request #2265 from jpuri/master

fix for #2263