rails_port_0.5: Merge rails_port r4664.