Add test for fix to #1078
Merge remote-tracking branch 'origin/jruby-1_7'