[dali_1.2.58] Merge branch 'devel/master' 85/151985/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:47 +0000 (15:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:47 +0000 (15:24 +0100)
Change-Id: I6f90d9f3fdf65d10e004df91ca1bef31d7344cba


Trivial merge