[sr-dev] git:master:452d257d: Merge pull request #2665 from easyrider14/master