local changes..
Merge https://github.com/webofbits/jruby