Since this patch has essentially been forwarded from the upstream bug tracker, I'm marking this bug as patch-forwarded-upstream.
Since this patch has essentially been forwarded from the upstream bug tracker, I'm marking this bug as patch-forwarded -upstream.