Merge pull request #2085 from guerrysemones/master