ie7 what page fixes
Merge branch 'master' into gh-pages