Merge pull request #5019 from cyberjacob/master