Update from upstream

Catch up on upstream before making changes.