David Leal

Merge branch 'MPR_07-18'