修复两个小问题
Merge branch 'master' into cdn