Merge branch 'master' into hashchecking

Conflicts:
	Makefile