Merge pull request #3282 from mhutch/netstandard-build