Merge pull request #2015 from chris5560/master