Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into nuevo
Merge branch '6696' of github.com:danbarretodev/chamilo-lms into 6696