[sr-dev] git:master:cc853665: Merge pull request #172 from mslehto/patch-2