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


Trivial merge