Sync changes from OMPI trunk