[sr-dev] git:master:770331df: Merge pull request #1020 from jhcloos/master