Merge joaomaiaduarte:master with abifet:master