Upgrade to comply with rails 4.1.x