[sr-dev] git:master:5fde5e87: Merge pull request #1242 from gaaf/random-fixes