sync with r789
Merge branch 'master' of https://github.com/xxjapp/HBShell