Fixes #1272 and hopefully #770
Merge branch 'jruby-1_7'