Merge "Fix build under GitC client."