[sr-dev] git:master:6b731cb0: Merge pull request #2283 from fredposner/master