Sync with GIT 1.5.3.3