Merge branch 'releases'
Merge branch 'master' into dev (suis un boulet, j'ai pas mergé le bon ><)