updates for rails 4.2.0 beta 2