Minor - Code convention
merge
merge
Merge branch 'ilosada-7225chamilo' into 1.9.x