Fixed some deprecation warnings

王权利请求将github/fork/jvanbaarsen/rails4合并到rails4

Created by: jvanbaarsen

Fixed some deprecation warnings

合并请求报告