Merge branch 'master' into pkexec

Conflicts:
	src/CMakeLists.txt
Merge branch 'pkexec' into debian

Conflicts:
	src/CMakeLists.txt