[sr-dev] git:master:9456bb94: Merge pull request #923 from mslehto/unittest