[sr-dev] git:master:f6270fcc: Merge pull request #334 from zxcpoiu/master