Merge ruby features

/cc @JonRowe