Merge tag 'v3.4.101' into mr2

This is the 3.4.101 stable release

Conflicts:
	Makefile