[dali_1.3.36] Merge branch 'devel/master' 59/186559/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:12:17 +0000 (10:12 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 10 Aug 2018 09:12:17 +0000 (10:12 +0100)
Change-Id: I304ec82bd26456c8594387ab1bf704bb658b1e65


Trivial merge