(cherry picked from commit 6b521aafb0b4db719cd4b6a173b51f27971c9fec)

Conflicts:

	contrib/bootstrap
	contrib/src/main.mak