[Lima-commits] 20/20: refs #1293 correction de merge