Fix location of HTML5 shim. Thanks Arlen!
Merge remote-tracking branch 'origin/grid' into grid