Patching upstream 3.4.15->3.4.16

Conflicts:
	Makefile