Merge branch 'master' into lichenxing
Merge branch 'lichenxing' of github.com:momoplan/mgr into lichenxing