Update to patched Rails 3.2.11
Merge with master