Merge branch 'rails4-pr1' into rails4