Fixes claroline/Claroline#375
Merge branch 'new_branch_name'