Update to the latest version

Update from upstream.