Merge pull request #1298 from chris5560/master