[mpich2-core] Merges into the 1.3.x branch