Tagging version 1.2.1rc1
Improve appearance of hexagon markers
Merge remote-tracking branch 'upstream/v1.2.x'

Conflicts:
	lib/matplotlib/__init__.py