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


Trivial merge