Merge pull request #3998 from aardappel/master

Switched C# accessors from classes to structs