Patch pushed as acf616efc8e966d2c99f2046666c3ee63d6e7d4b. Thanks.