merge 19601:19888 of rails_port into the openID branch