Merge branch 'hotfix/2.5'
Atualização 2.6
Merge branch 'hotfix/2.6' into develop