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


Trivial merge