[sr-dev] git:master:6208c36b: Merge pull request #934 from ffontaine/master