#1 master

Closed
ZhangbuDong wants to merge 3 commits from :master into master