Sync with Git 1.7.0.3