UPDATES FROM UPSTREAM

Mostly stuff I don't care about, but keeping things current.