Optimised grid-1
Grid updates
Merge branch 'master' into ie8-support