[dali_1.3.53] Merge branch 'devel/master' 40/194640/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 6 Dec 2018 11:30:12 +0000 (11:30 +0000)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 6 Dec 2018 11:30:12 +0000 (11:30 +0000)
Change-Id: I56145b0fdc0a4078071ac56e5838495af94d975a


Trivial merge