Update rails4 with changes to master