FIX: sphinx 1.4.0 details#7006

jenshnielsen merged 1 commit intomatplotlib:mastermatplotlib/matplotlib:masterfrom

tacaswell:fix_bad_sphinx_mergetacaswell/matplotlib:fix_bad_sphinx_mergeCopy head branch name to clipboard