Updating with the latest changes from upstream.