Merge pull request #4714 from neheb/master