Pull upstream changes

Our fork is quite out of date, and needs to be updated.