I've pushed these two patches as
0e953f3332cc862b08ecb2342bdac9976dd6d08c and
0e953f3332cc862b08ecb2342bdac9976dd6d08c now.

Thanks,

Chris