David Leal

Merge branch 'MPR_bug_05-29a'