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

Make pyplot.bar color kwarg less ambiguous
Merge remote-tracking branch 'upstream/v1.2.x' into v1.3.x

Conflicts:
	lib/matplotlib/axes.py