Merge "Fix SWIG C# Build" into devel/master