Create a branch for the merge, so it's easier to do local testing
without having to constantly revert out of master.
Merge pull request #3356 from fperez/mpr-fixes

git-mpr fixes

Create a branch for the merge, so it's easier to do local testing without having to constantly revert out of master.