Merge with upstream

Pulling in recent changes.