Merge branch 'master' into defer

Conflicts:
	Makefile
	memtrail
	memtrail.cpp