diff --git a/src/evalvars.c b/src/evalvars.c
index 92dcd76..d111b80 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2889,6 +2889,7 @@
 	    {
 		ht = &globvarht;
 		ret = find_var_in_ht(ht, *name, auto_name, TRUE);
+		vim_free(auto_name);
 		if (ret != NULL)
 		{
 		    if (htp != NULL)
@@ -2896,7 +2897,6 @@
 		    return ret;
 		}
 	    }
-	    vim_free(auto_name);
 	}
     }
 
diff --git a/src/version.c b/src/version.c
index ecfa17d..957ccee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4084,
+/**/
     4083,
 /**/
     4082,