merging in ruby-git updates