Merge pull request #2660 from pbostley/master