Merge branch 'master' into compile-staging

Conflicts:
	src/application.cpp
Merge branch 'compile-staging' into compile-server2