[sr-dev] git:master:19786d85: Merge pull request #849 from winem/master