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


Trivial merge