Sync with OMPI devel trunk r31533