Depot Scaffold
Merge branch 'master' into originMaster

Conflicts:
	.gitignore