Merge pull request #2844 from pyhalov/jruby