Merged in Rails 3.1 deprecation warnings pull request