cleanup
Merge branch 'dev' of https://github.com/thinktecture/Thinktecture.IdentityServer.v3 into dev

Conflicts:
	source/Core/Services/Caching/CachingScopeStore.cs