Merge branch 'hotfix/0.21.3'
Add shim for IE8 support
Merge branch 'master' into develop