Merge pull request #4481 from migueldeicaza/master