Merge branch 'more_jruby' into m