[Lima-commits] 01/01: refs #1174 correction de merge