Grid Adjustments for i.e. and Chrome
Merge branch 'master' into Iris