teste
teste
teste
Merge branch 'release/3.5'
Merge branch 'release/3.5' into develop

Conflicts:
	index.php
Merge branch 'develop'