Merge remote-tracking branch 'origin/gesture' into tweaks

Conflicts:
	src/ui/mainwindow.cpp