Merge upstream changes

just a couple changes...