Sync to OMPI trunk r32464