Merge branch 'master' into cmake

Conflicts:
	emu/CMakeLists.txt
	gui/CMakeLists.txt