Pull GIT 1.2.4 fixes from master