Refresh from upstream
Set version to match