Imported Upstream version 2.4+gitab9c37f
Imported Upstream version 2.4+gitfaa33637a8
Merge tag 'upstream/2.4+gitfaa33637a8'

Upstream version 2.4+gitfaa33637a8

Conflicts:
	.gitignore
	qCC/ccCommon.cpp
	qCC/ui_templates/mainWindow.ui
ok
gitignore conflict