Local config
Merge remote-tracking branch 'upstream/master'
Fix deprecated API use
Merge pull request #1 from Education-Numerique/master

Backport stuff