Upgrade Rails to latest security release
Merge branch 'master' into updating_template