Merge remote-tracking branch 'upstream/master'
close claroline/Claroline#602
Merge remote-tracking branch 'upstream/master'
Merge pull request #616 from solispauwels/master

close claroline/Claroline#602