Sync debian/ with upstream