diff --git a/src/if_py_both.h b/src/if_py_both.h
index f8b51b7a32..dc9be3ad2d 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -1838,10 +1838,10 @@ WindowAttr(WindowObject *this, char *name)
 	return Py_BuildValue("(ll)", (long)(pos->lnum), (long)(pos->col));
     }
     else if (strcmp(name, "height") == 0)
-	return Py_BuildValue("l", (long)(this->win->w_height));
+	return PyLong_FromLong((long)(this->win->w_height));
 #ifdef FEAT_VERTSPLIT
     else if (strcmp(name, "width") == 0)
-	return Py_BuildValue("l", (long)(W_WIDTH(this->win)));
+	return PyLong_FromLong((long)(W_WIDTH(this->win)));
 #endif
     else if (strcmp(name, "vars") == 0)
 	return DictionaryNew(this->win->w_vars);
diff --git a/src/version.c b/src/version.c
index f6d3840d84..8e311b861b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    939,
 /**/
     938,
 /**/