Patch pushed as 349f730e0e6154e2ed174a8745c768933d57ccb8. Thanks.