Merge branch 'dev'
修正默认 encoding 无法获取的 bug
Merge branch 'master' into dev