Checkout
wrowe
committed
on 21 Aug 12
Reviewed and backporting now