Update Rails to 3.2.11 with security fixes
Merge branch 'master' into heroku