Close claroline/Claroline#607
Merge pull request #802 from solispauwels/master

Close claroline/Claroline#607