Bring git up to date with svn r57480.