This patch fails to apply yet again, this time due to a collusion in catversion.h. I think it's fine to omit the change in catversion.h as it's likely to repeatedly cause conflicts, and instead just mention it on the thread. Any committer picking it up will know to perform the change anyways, so leaving it out can keep the patch from conflicting.