Checkout
cmpilato
committed
on 13 Aug 12
Propose r1242759 and friends for backport to 1.7.x.