Merge remote-tracking branch 'upstream/v1.2.x'

Conflicts:
	lib/matplotlib/axes.py