Patch pushed as 173b4e453cf24b21dffafbfd21b9e3007ae215a6.
Thanks.