Merge pull request #3086 from esdrubal/master