Merge pull request #1588 from gennadiycivil/master

mostly 193547722