Synced.
Merge branch 'master' into issue78
Updated protoc-gen-cs.