This seems good to me, I've pushed to master as
87638cdd48ccf9537e3e5bcc8156df7a38c1e54a.

Thanks,

Chris