[dali_1.3.29] Merge branch 'devel/master' 66/182366/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:56:04 +0000 (08:56 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:56:04 +0000 (08:56 +0100)
Change-Id: I314f6254a032a9bdf0907fe2173ee6231f6987fa


Trivial merge