Based on atambo/jruby@586a3d9, resolve any conflict with the current master. Resolve #468.