Merge pull request #2310 from chris5560/master