Comment 8 for bug 1800872

The patch against 2.5 has landed, but it only fixes the Query, it doesn't introduce an upgrade step.
It is also unclear whether this will end up in 2.5.2 or 2.5.3 as we won't block 2.5.2 for it, but it may be that we won't finish getting a clean report for 2.5.2 until after this patch is released.