Merge remote-tracking branch 'origin/master-qa' into jpattoni
fuentes-dinero listo excepto "delete"
Merge branch 'jpattoni' into master-qa