[sr-dev] git:master:263546f9: Merge pull request #996 from ffontaine/master