Merged .NET reorganisation branch to trunk.
Authored by: crowbar27 2017-09-17
Parent: [r901]
Child: [r903]