Patch pushed as 8e85920cb73966d10c41b82a4bb48a4df16498e2. Thanks.