Merge pull request #3254 from mono/netstandard