Upgrade Rails to 3.2.12
Merge branch 'upgrade'