fix bug.
Merge branch 'wzp-local'
Merge branch 'master' of https://github.com/xdfcn/vps