Develop

 @benoitg So, I've checked this release and all seems ok to me. @kyriog can you check if this is ok to put these commits in production ?
Freddy