Sync with GIT 1.6.2.5