Merge git://github.com/vnwildman/git