Merge pull request #3061 from Thorium/master