Merge pull request #4745 from BitLooter/master