[sr-dev] git:4.2:beccabd0: Merge pull request #181 from fredposner/patch-1