Update from upstream

* Adds installing ruby with a patch