preliminary fix
Merge branch 'refs/heads/hotfix-ie8+' into develop