Merge pull request #2680 from KurdyMalloy/master