Merge remote-tracking branch 'mpl/master' into vp-squashe

Conflicts:
	lib/matplotlib/tests/test_axes.py
	lib/matplotlib/tests/test_mlab.py