Tratamento dos conflitos do merge com o master (2.3.5-SNAPSHOT)
Merge branch '2.4.0' of github.com:demoiselle/framework into 2.4.0