Whoops, I must have mucked up the rebase. Thanks.