Squash Commits 3.0.89

Conflicts:
	Makefile