Had to undo commit to new MPI branch. The changes went into the original and not the branch. The files committed here are exactly the same as revision 969.