cambios generales y migraciones
Merge remote-tracking branch 'upstream/master' into sql-server