Merge branch 'master' into fix-app-icon-lookup

# Conflicts:
#	src/core/appdir.cpp
#	tests/core/CMakeLists.txt
#	tests/core/test_appdir.cpp
#	tests/core/test_linuxdeploy.cpp