Merge up rubywarrior deltas