fixes https://github.com/thinktecture/Thinktecture.IdentityServer.v3/issues/271
Merge remote-tracking branch 'upstream/master'
Merge pull request #310 from cendter/master

fixes https://github.com/thinktecture/Thinktecture.IdentityServer.v3/issues/271