Merge pull request #4647 from salzmdan/master