Attaching proposed fix as diff file (to ease testing) - AFAICT it applies ok to 0.91.x (with offsets) and trunk (r14202).
Attaching proposed fix as diff file (to ease testing) - AFAICT it applies ok to 0.91.x (with offsets) and trunk (r14202).