Repo crashed. Reinstating from working copy.
Merge branch 'master' into develop

Conflicts:
	Garm.Core/Garm.Core.csproj
	Garm.Core/GarmKernel.cs
	GarmCli/App.config