Merge remote-tracking branch 'origin/rails4_migration'