[dali_1.2.53] Merge branch 'devel/master' 15/144915/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 18 Aug 2017 09:21:36 +0000 (10:21 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 18 Aug 2017 09:21:36 +0000 (10:21 +0100)
Change-Id: I5ee5d128725f255af67dcb3de089df3428cabd6d


Trivial merge