Merge pull request #2634 from mrjoel/master