Merge branch 'master' into Drh
Tests Modulo Drh Entity Setor
Merge branch 'Drh'