[sr-dev] git:master:6b044936: Merge pull request #1347 from sergey-safarov/master