[sr-dev] git:master:7b4b3f25: Merge pull request #2656 from fredposner/master