Merge remote-tracking branch 'github/jruby-1_7' into jruby-1_7
Merge branch 'jruby-1_7'