Merge for several tasks

https://github.com/chamilo/chamilo-lms/commit/301fb962da7eb87ddb8eff15deee92804228fda1#commitcomment-5835012