Fixing bug
Merge branch 'master' into jruby-with-jdbc