David Leal

Merge branch 'MPR_2013-06-14a'