Codebase synchronization against jruby-1_7