Patch pushed as 8f4b37ee7d848df853078af6d9cea46b24be5b4f. Thanks.