Update to rails 3.2.11
Merge remote-tracking branch 'origin/master'