hot fix for ie8
Merge branch 'master' into gh-pages