Merge master to get fixes up to GIT 1.2.3