Merge pull request #1630 from sergey-safarov/master