Patch pushed as ae018ad9780b34d83d9324bfebf8886310dbd849. Thanks.