Merge remote-tracking branch 'origin/v1.4.x'

Conflicts:
	INSTALL
	lib/matplotlib/tests/test_coding_standards.py