Merge pull request #1580 from gennadiycivil/master

merging