recommit
Merge pull request #2 from chengyishi/master

confirm recommit
Merge pull request #1 from ops-baidu/master

merge change from ops-baidu bdrp master