Rubinius 2 compatibility
Merge remote-tracking branch 'mgh/master'