Merge remote-tracking branch 'upstream/master'

Conflicts:
	Dagon/DGControl.cpp