small fix;
Merge branch 'master' into rails4