Patched to Rails 3.2.11