[sr-dev] git:master:7c03340b: Merge pull request #933 from ffontaine/master