Alterado
Merge origin/master