Manually applied Rubinius 45553a17.
Manually applied Rubinius f060329e.
Manually applied Rubinius 7ebf682.