minor
Merge branch 'master' of https://github.com/HaoWan/trunk_test