[sr-dev] git:master:0ef77595: Merge pull request #1139 from zhangst/master