Merge pull request #2286 from migueldeicaza/master