Merge pull request #2667 from chris5560/master