Issue #28616: merge from 3.6

ned-deily · ned-deily · commit e37c1cbf66c5 · 2016-11-04T17:07:47.000-04:00
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -1488,6 +1488,7 @@ Takase Arihiro
 Indra Talip
 Neil Tallim
 Geoff Talvola
+Anish Tambe
 Musashi Tamura
 William Tanksley
 Christian Tanzer
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1739,7 +1739,7 @@ static PyStructSequence_Field version_info_fields[] = {
     {"major", "Major release number"},
     {"minor", "Minor release number"},
     {"micro", "Patch release number"},
-    {"releaselevel", "'alpha', 'beta', 'candidate', or 'release'"},
+    {"releaselevel", "'alpha', 'beta', 'candidate', or 'final'"},
     {"serial", "Serial release number"},
     {0}
 };
