Commit c6b4a7e9b07eb4025da65f12ad43fb7982ef3d0b

Authored by Marco Aurelio da Costa
2 parents 88ea12b1 65caa3d8

Fixing conflicts