Merge branch 'stable' into 1.6-release

CHANGES

@@ -219,6 +219,7 @@ Bugs fixed
 * #3614: Sphinx crashes with requests-2.5.0
 * #3618: autodoc crashes with tupled arguments
 * #3664: No space after the bullet in items of a latex list produced by Sphinx
+* #3657: EPUB builder crashes if document startswith genindex exists
 
 Testing
 --------

doc/_templates/indexsidebar.html

@@ -3,7 +3,7 @@
   {%trans%}project{%endtrans%}</p>
 
 <h3>Download</h3>
-{% if version.endswith('a0') %}
+{% if version.endswith('+') %}
 <p>{%trans%}This documentation is for version <b><a href="changes.html">{{ version }}</a></b>, which is
   not released yet.{%endtrans%}</p>
 <p>{%trans%}You can use it from the

doc/conf.py

@@ -16,7 +16,7 @@ exclude_patterns = ['_build']
 
 project = 'Sphinx'
 copyright = '2007-2017, Georg Brandl and the Sphinx team'
-version = sphinx.__released__
+version = sphinx.__display_version__
 release = version
 show_authors = True
 

sphinx/builders/_epub_base.py

@@ -449,7 +449,7 @@ class EpubBuilder(StandaloneHTMLBuilder):
         This method is overwritten for genindex pages in order to fix href link
         attributes.
         """
-        if pagename.startswith('genindex'):
+        if pagename.startswith('genindex') and 'genindexentries' in addctx:
             if not self.use_index:
                 return
             self.fix_genindex(addctx['genindexentries'])