Merge branch 'master' into web-dav

Conflicts:
	src/app/authdialog.cpp
Merge branch 'web-dav'