Most of the patch got applied to the trunk, so what remains is