Merge 3.6 (issue #28635)

Doc/c-api/exceptions.rst

@@ -311,7 +311,7 @@ an error value).
    Much like :c:func:`PyErr_SetImportError` but this function allows for
    specifying a subclass of :exc:`ImportError` to raise.
 
-   .. versionadded:: 3.4
+   .. versionadded:: 3.6
 
 
 .. c:function:: int PyErr_WarnExplicitObject(PyObject *category, PyObject *message, PyObject *filename, int lineno, PyObject *module, PyObject *registry)

Doc/library/struct.rst

@@ -232,6 +232,10 @@ platform-dependent.
 .. versionchanged:: 3.3
    Added support for the ``'n'`` and ``'N'`` formats.
 
+.. versionchanged:: 3.6
+   Added support for the ``'e'`` format.
+
+
 Notes:
 
 (1)