Update upstream

* Includes installing patched ruby