See URL. Quote from the patch: # Various small fixes from CVS that are considered safe to apply to 2.8.6. Reproducible: Always Steps to Reproduce:
Added to -r1, thanks!