Patch pushed as da70132ee98093cb2aad672ee72e0d2f308eff2d. Thanks.