Merge pull request #2219 from chris5560/master