Merge pull request #1686 from akoeplinger/integrate-net20_35-reference-assemblies