Patch pushed as 174a622f637dc9d912fdfd963685112258d4f4fa. Thanks.