…t-of-pr-13667-on-v3.1.x

Backport PR matplotlib#13667 on branch v3.1.x (Fix incorrect signature in axis() doc.)

…ontList.

…t-of-pr-13678-on-v3.1.x

Backport PR matplotlib#13678 on branch v3.1.x (Fix font deduplication logic in createFontList.)

…nd use that in mplot3d.

…t-of-pr-13363-on-v3.1.x

Backport PR matplotlib#13363 on branch v3.1.x (Inline iter_ticks into _update_ticks, and use that in mplot3d.)

…ursor data.

…t-of-pr-13684-on-v3.1.x

Backport PR matplotlib#13684 on branch v3.1.x (Use format_data_short to format image cursor data.)

…t-of-pr-13687-on-v3.1.x

Backport PR matplotlib#13687 on branch v3.1.x (Update stem example)

…ties.

…t-of-pr-13677-on-v3.1.x

Backport PR matplotlib#13677 on branch v3.1.x (Log all failures to extract font properties.)

…t-of-pr-13588-on-v3.1.x

Backport PR matplotlib#13588 on branch v3.1.x (FIX: fallback to viewlims if no data)

…n Timer.remove_callback.

…er scale_units='xy'

…nd Tools.

…t-of-pr-12170-on-v3.1.x

Backport PR matplotlib#12170 on branch v3.1.x (Deprecate considering *args, **kwargs in Timer.remove_callback.)

…t-of-pr-12419-on-v3.1.x

Backport PR matplotlib#12419 on branch v3.1.x (Add DivergingNorm (again, again, again))

…t-of-pr-13689-on-v3.1.x

Backport PR matplotlib#13689 on branch v3.1.x (BUG: fix scaling of quiverkey when quiver scale_units='xy')

…t-of-pr-12760-on-v3.1.x

Backport PR matplotlib#12760 on branch v3.1.x (Deduplicate implementation of per-backend Tools.)

Adds support for rgba and rgb images to pcolorfast

Conflicts:
	lib/matplotlib/axes/_axes.py
          - C.shape -> np.shape(C) bug fix was not backported

…r-8690-on-v3.1.x

Backport PR matplotlib#8690 on branch v3.1.x

…ated.

…t-of-pr-13716-on-v3.1.x

Backport PR matplotlib#13716 on branch v3.1.x (Kill attributes that are never used/updated.)

…t-of-pr-13745-on-v3.1.x

Backport PR matplotlib#13745 on branch v3.1.x (Fix stem(use_line_collection))

…t-of-pr-14197-on-v3.1.x

Backport PR matplotlib#14197 on branch v3.1.x (Minor cleanup of acorr/xcoor docs)

…t-of-pr-14210-on-v3.1.x

Backport PR matplotlib#14210 on branch v3.1.x (Make intro tutorial less jargony.)

…t-of-pr-14212-on-v3.1.x

Backport PR matplotlib#14212 on branch v3.1.x (DOC: update ghstats and credit.rst)

…t-of-pr-14098-on-v3.1.x

Backport PR matplotlib#14098 on branch v3.1.x (Improve Errorbar limits example)

…t-of-pr-14135-on-v3.1.x

Backport PR matplotlib#14135 on branch v3.1.x (Improve docs on Axes quiver)

…t-of-pr-14229-on-v3.1.x

Backport PR matplotlib#14229 on branch v3.1.x (Add missing space in warning message)

…ocstring

…t-of-pr-14228-on-v3.1.x

Backport PR matplotlib#14228 on branch v3.1.x (DOC: fix parameters line in Axes.axis docstring)

…lling constrained_layout

…t-of-pr-14185-on-v3.1.x

Backport PR matplotlib#14185 on branch v3.1.x (FIX: adjust suptitle placement after calling constrained_layout)

DOC: note change in RBGA resampling

These were being stashed in the old place we kept them and got missed
on the first pass.

TST: register custom marks

The first release of the v3.1 series

This version of Matplotlib support Python 3.6+

Highlights of this release include:

 - A helper method for scatter legends
 - Secondary axis support (ex, degrees and radians)
 - A concise date formatter
 - No longer requires a framework build of Python to use OSX backend
 - Major and minor ticks will no longer collide by default
 - A progress callback for animations
 - mplot3D is always registered
 - deprecated mlab functions have been removed
 - Many function calls have become stricter about invalid or ignored input

Resolved all conflicts in favor of the master branch except for the
changes to doc/api/prev_api_changes/api_changes_3.1.0.rst

pcolorfast was updating to take RGB(A) in some cases in PR matplotlib#8690 /
94b0bca that was backported to v3.1.x
via matplotlib#13709 / afc4e61 .  However, the
functionality was further extended in matplotlib#13986 /
c05537d which was not backported.
When merging v3.1.x into master special care had to be taken to not
pull the removed code back into master.