Merge pull request #1600 from chris5560/master