Make pyplot.bar color kwarg less ambiguous
Merge pull request #2308 from dmcdougall/v1.2.x

Make pyplot.bar color kwarg less ambiguous
Merge pull request #2340 from lpsinger/patheffects_math_text

Fix #2339: render math text when using path effects
Merge pull request #2328 from mspacek/qtapi

Fix PySide compatibility
Conflicts:
	lib/matplotlib/backends/qt4_editor/formlayout.py
Merge remote-tracking branch 'upstream/v1.2.x' into v1.3.x

Conflicts:
	lib/matplotlib/axes.py
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/backends/qt4_editor/formlayout.py