[Isis-fish-devel] Merge de branch malheureux