Patch 3.4.29

Conflicts:
	Makefile
	Patch Log.txt