Patch pushed as 0b9aea07d2d93de4c454d8e8ec39fa6ae8da2fd4. Thanks.