Merge pull request #3394 from mono/netstandard