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