强制自动填充的错误，英语版修改
Merge branch 'develop' into gh-pages