[dali_1.3.40] Merge branch 'devel/master' 73/188673/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 7 Sep 2018 07:32:09 +0000 (08:32 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 7 Sep 2018 07:32:10 +0000 (08:32 +0100)
Change-Id: I1410106bfe2b68aad7122aaa3e9d238213e6550a


Trivial merge