No bundle shit
Merge branch '2-2-stable' into tweak-rubies