[sr-dev] git:master:6f982375: Merge pull request #912 from mslehto/unittest