Merge branch 'release/r2012.12.31.1958' into develop
castellanización
Merge branch 'develop'