Merge branch 'master' into tweaks

Conflicts:
	src/ui/mainwindow.cpp
	src/ui/mainwindow.ui