Merge pull request #3791 from aarond10/patch-1