merge
Merge branch '1.9.x' of github.com:aragonc/chamilo-lms into 1.9.x