devel2 branch
Merge branch 'master' into devel2

Conflicts:
	main.cpp