Merge remote-tracking branch 'origin/eduardo'
Merge branch 'eduardo'
Merge branch 'master' into jmirandas