Rails 3.2.21 upgrade
Merge branch 'master' into trusty_update