Update code from upstream.