Update for rails edge (4.2)