fix merge conflict between rails4 branch and 99dcfae