Patch Set 3: Looks good to me, but someone else must approve

I'm ready to commit this, but the JGit dependency that was committed for it hasn't built yet.

I don't think I have access to start a JGit build.