Merge branch 'master' into sdl2

Conflicts:
	Makefile
	README