Jon rebase

@tcr I just rebased our branch on top of the upstream branch to get all the changes since February.