[dali_1.4.41] Merge branch 'devel/master' 60/215560/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 Oct 2019 14:58:35 +0000 (15:58 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 Oct 2019 14:58:35 +0000 (15:58 +0100)
Change-Id: I20d6a7c699dc68d5eeeb7049a6074d12b0c746ea


Trivial merge