Merge remote-tracking branch 'remotes/astaxie/develop' into develop
code style simplify
Merge pull request #693 from fuxiaohei/develop

code style simplify