Merge branch 'rails4'