Trying IntelliJ again.
Merge remote-tracking branch 'origin/jruby-1_7'