Update to rails 3.2.12
Merge branch 'hotfix/1.0.1'
Merge remote-tracking branch 'origin/master'