Sync to OMPI devel trunk r31537