Bump rails gem to 3.2.21
Merge branch 'rails_3_2_21'

* rails_3_2_21:
  Bump rails gem to 3.2.21