Merge pull request #2743 from salzmdan/master