Hoping this will fix weird things going on.
Merge branch 'master' into develop

Conflicts:
	mainwindow.ui