Patch pushed as fe09d32e34d30c92587536b581361e8c9be850f2. Thanks.