Checkout
Daniel Gruno
committed
on 10 May 12
Backport r1336590