Sync to r32276 of OMPI trunk