From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Fri, 22 Sep 2017 16:20:32 +0000 (+0200)
Subject: Merge branch 'master' into V9_dev
X-Git-Tag: V9_0_0~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=918b715da135e7c4208fd5c66fe32437c08022cf;p=tools%2Fconfiguration.git

Merge branch 'master' into V9_dev
---

918b715da135e7c4208fd5c66fe32437c08022cf