Merge pull request #1759 from gennadiycivil/master

merge