[sr-dev] git:master:2058e733: Merge pull request #932 from ffontaine/master