Merge branch 'master' into FdoSilva
arreglo single especial, sync con astrid
Merge branch 'FdoSilva'