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


Trivial merge