Fix csharp build issues when doing out-of-source builds
Merge branch 'branch-6-4'