Merge recent changes from upstream.