Merge pull request #1760 from salzmdan/master