Merge branch 'stable' into master

Conflicts (fixed)::
	sphinx/texinputs/sphinx.sty

CHANGES

@@ -155,6 +155,7 @@ Bugs fixed
 * #2917: inline code is hyphenated on HTML
 * #1462: autosummary warns for namedtuple with attribute with trailing underscore
 * Could not reference equations if ``:nowrap:`` option specified
+* #2873: code-block overflow in latex (due to commas)
 
 Release 1.4.6 (released Aug 20, 2016)
 =====================================

doc/extdev/markupapi.rst

@@ -125,6 +125,8 @@ Both APIs parse the content into a given node. They are used like this::
 
    node = docutils.nodes.paragraph()
    # either
+   from sphinx.ext.autodoc import AutodocReporter
+   self.state.memo.reporter = AutodocReporter(self.result, self.state.memo.reporter)  # override reporter to avoid errors from "include" directive
    nested_parse_with_titles(self.state, self.result, node)
    # or
    self.state.nested_parse(self.result, 0, node)

sphinx/texinputs/sphinx.sty

@@ -291,6 +291,7 @@
     \def\PYGZti{\discretionary{\char`\~}{\sphinxafterbreak}{\char`\~}}%
 }
 
+\def\sphinx@verbatim@nolig@list {\do \`}%
 % Some characters . , ; ? ! / are not pygmentized.
 % This macro makes them "active" and they will insert potential linebreaks
 \newcommand*\sphinxbreaksatpunct {%
@@ -403,6 +404,8 @@
         }%
      % For grid placement from \strut's in \FancyVerbFormatLine
      \lineskip\z@skip
+     % active comma should not be overwritten by \@noligs
+     \let\verbatim@nolig@list \sphinx@verbatim@nolig@list
      % will fetch its optional arguments if any
      \OriginalVerbatim
 }