merge down
Merge branch 'master' into develop

Conflicts:
	Avalanche/bin/Debug/Avalanche.vshost.exe