I think you may have to rebase off master, since these are the changes I had made earlier today.