Better fallback for IE8/9
Merge branch 'master' into production