Patch pushed as aae46e30d953dd24a5e04ffa5a397c70ef42b945. Thanks.