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


Trivial merge