First
Merge https://github.com/StephanZumbuehl/depot

Conflicts:
	.gitignore