New upstream release
Beautifull upstream changes
Merge upstream 1.2, fix AD convoyeur, github url