Update Rails for security alerts.
Merge remote-tracking branch 'oss/master'
Merge branch 'master' into staging