Merge pull request #2306 from migueldeicaza/master