fixes claroline/claroline#390
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from solispauwels/master

fixes claroline/claroline#390