fixing tests on jruby
Merge remote-tracking branch 'origin/master' into two-point-oh