Update for rails 4.2.0