update patches to trunk