Merge language changes from upstream.