[dali_1.4.36] Merge branch 'devel/master' 83/213483/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 5 Sep 2019 14:28:36 +0000 (15:28 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 5 Sep 2019 14:28:36 +0000 (15:28 +0100)
Change-Id: Icc9022b04a33d4e007173012bb81c38937700412


Trivial merge