Merge master into openapi#1707

bkoelman merged 4 commits intoopenapijson-api-dotnet/JsonApiDotNetCore:openapifrom

merge-master-into-openapijson-api-dotnet/JsonApiDotNetCore:merge-master-into-openapiCopy head branch name to clipboard