update rails to 3.2.21
Merge pull request #2221 from opf/hotfix/release-4.0-rails-3.2.21

update rails to 3.2.21 (4.0 release)
Merge branch 'release/4.0' into dev