Merge remote-tracking branch 'github/3.7/misc' into 3.7/master
Merge tag 'v3.7.3' into 3.7/master

This is the 3.7.3 stable release

Conflicts:
	Makefile