Recent updates from upstream.