Merge remote-tracking branch 'upstream/master' into pidfile-support

Conflicts:
	CMakeLists.txt
	src/daemon/Display.cpp