Pulling in recent upstream changes.