修复IE下报错的问题
Merge branch 'master' into gh-pages