3.0.82

Conflicts:

	Makefile