Patch pushed as b94b334cb7f77fdd9380d76e25d85664adb5b997. Thanks.