[sr-dev] git:master:864149a1: Merge pull request #1652 from mbodbg/master