IE8 compatibility
Merge branch 'dev'