Merge in GIT 1.5.3.8