Update to work with git 2.0.1 and later