Merge fixes up to GIT 1.1.6