From: rnv <rnv@opencascade.com>
Date: Thu, 28 Dec 2017 14:58:11 +0000 (+0300)
Subject: Merge changes from 'master' branch.
X-Git-Tag: V9_0_0^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c8b736c5c4f3a60ebca7bd3950fbe4efb7db453e;p=samples%2Fcomponent.git

Merge changes from 'master' branch.
---

c8b736c5c4f3a60ebca7bd3950fbe4efb7db453e