Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Correção
Merge branch '1.0'