[dali_1.3.38] Merge branch 'devel/master' 87/187487/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:38 +0000 (15:03 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:38 +0000 (15:03 +0100)
Change-Id: Ic731b8b8444abecc992bfbac8b90091b674df7c2


Trivial merge