update for Rails 4.1 final