diff --git a/src/ex_getln.c b/src/ex_getln.c
index 7411732449..7659a37ff6 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5202,7 +5202,7 @@ globpath(path, file, ga, expand_options)
 		    for (i = 0; i < num_p; ++i)
 		    {
 			((char_u **)ga->ga_data)[ga->ga_len] =
-					    vim_strnsave(p[i], STRLEN(p[i]));
+					vim_strnsave(p[i], (int)STRLEN(p[i]));
 			++ga->ga_len;
 		    }
 		}
diff --git a/src/version.c b/src/version.c
index 28a4136d30..6c113c7b06 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    316,
 /**/
     315,
 /**/