Update Rails to 3.2.21
Merge branch 'rails-3.2.21'