Here is rebase.  Apparently I'll have to do it often, since the CATALOG_VERSION_NO changed in the patch.