Merge branch 'master' into dl

Conflicts:
	Makefile