[sr-dev] git:master:199f13a7: Merge pull request #2842 from DavidKorczynski/master