Merge pull request #1032 from miguelzf/master