diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ff5a6df9a6..5bbc4c305b 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3261,7 +3261,11 @@ set_one_cmd_context(xp, buff)
 	    ++p;
 	/* for python 3.x: ":py3*" commands completion */
 	if (cmd[0] == 'p' && cmd[1] == 'y' && p == cmd + 2 && *p == '3')
+	{
 	    ++p;
+	    while (ASCII_ISALPHA(*p) || *p == '*')
+		++p;
+	}
 	len = (int)(p - cmd);
 
 	if (len == 0)
diff --git a/src/version.c b/src/version.c
index 3d5edc0bcb..6fed35fb2e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    121,
 /**/
     120,
 /**/