This is from master.

Thanks for taking a look at this.