Merge fixes up to GIT 1.2.3