[sr-dev] git:master:ac30274f: Merge pull request #1181 from hdikme/master