Merge tag 'v3.8.8' into 3.8/master

This is the 3.8.8 stable release

Conflicts:
	Makefile