Merge fixes up to GIT 1.0.6