Merge branch 'master' into diseno
Merge branch 'master' into diseno