update to v6.0.5
Merge branch 'master' of https://github.com/yehai/3rd