Merge rails_port_0.5