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