[dali_1.3.28] Merge branch 'devel/master' 40/181140/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 8 Jun 2018 10:50:24 +0000 (11:50 +0100)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 8 Jun 2018 10:50:24 +0000 (11:50 +0100)
Change-Id: I5f15da4c490c922d2c01a574be34aa1dea6681bf


Trivial merge