Merge pull request #4411 from chris5560/master