ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	Drivers/Allors.Workspaces.Memory/Allors.Workspaces.Memory.csproj