Bypassed scaling bug due to Qt.
Merge remote-tracking branch 'origin/master' into multiedit

Conflicts:
	ToolKit/Source/MainWindow.cpp