Patch pushed as c02450c2373ad8b60b93a67bab6891b4321e34b3. Thanks.