Merge pull request #3760 from KurdyMalloy/master