Fix bug https://github.com/jruby/jruby/issues/1156 .

Signed-off-by: Charles Oliver Nutter <headius@headius.com>
Merge branch 'jruby-1_7'