Merge temp/ruby-depsolver

/cc @seth