This branch targets Rails 4.0