merge 19889:20181 of rails_port into the openID branch