Patch pushed as c8f406056fb0f371e8cc15d92938528d9948e767. Thanks.