keep rails4 branch sync with master