Merge latest upstream

Just finishing testing of this, but it looks like it's going to pass...