CBA branch for Rails 3.1