Merge branch 'jruby-travis' into patches