Merge branch 'master' into DRCAPCIS

Conflicts:
	CAPCIS Solution/ExtensionSettings/git/Settings.json