Merge master into MPI