[dali_1.3.24] Merge branch 'devel/master' 95/178595/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:56:10 +0000 (15:56 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:56:10 +0000 (15:56 +0100)
Change-Id: I1c06778da55b8ace3a4c5518a29f8eb91c2c40bf


Trivial merge