Merge pull request #2834 from preco21/master