merge 2.7.15 release branch
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 396c47e..99e8370 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,11 +23,11 @@
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 7
#define PY_MICRO_VERSION 15
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "2.7.15rc1"
+#define PY_VERSION "2.7.15"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Misc/NEWS.d/2.7.15.rst b/Misc/NEWS.d/2.7.15.rst
new file mode 100644
index 0000000..52b99da
--- /dev/null
+++ b/Misc/NEWS.d/2.7.15.rst
@@ -0,0 +1,9 @@
+.. bpo: 33374
+.. date: 2018-04-29-12-07-00
+.. nonce: -xegL6
+.. release date: 2018-04-29
+.. section: Core and Builtins
+
+Tweak the definition of PyGC_Head, so compilers do not believe it is always
+16-byte aligned on x86. This prevents crashes with more aggressive
+optimizations present in GCC 8.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
deleted file mode 100644
index 9ec1a60..0000000
--- a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Tweak the definition of PyGC_Head, so compilers do not believe it is always
-16-byte aligned on x86. This prevents crashes with more aggressive
-optimizations present in GCC 8.