[sr-dev] git:master:739461f5: Merge pull request #990 from ffontaine/master