Patch pushed as 86af6091d8ca1cc69ac12267d51544d50268e146. Thanks.