[dali_1.4.1] Merge branch 'devel/master' 34/196834/1
authorDavid Steele <david.steele@samsung.com>
Fri, 4 Jan 2019 17:40:27 +0000 (17:40 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 4 Jan 2019 17:40:27 +0000 (17:40 +0000)
Change-Id: I7f0bf469a39b31010455b48ddf706fb4c5babf48


Trivial merge