incomplete commit
Merge remote-tracking branch 'origin/cef' into cef

Conflicts:
	CPP/VS/Solution.sln