[sr-dev] git:master:73d8d719: Merge pull request #150 from mslehto/patch-2