[sr-dev] git:4.2:61d84c02: Merge pull request #184 from fredposner/patch-2