rails security update
Merge branch 'rm_production'