[dali_1.4.1] Merge branch 'devel/master' 38/196838/1
authorDavid Steele <david.steele@samsung.com>
Fri, 4 Jan 2019 17:41:04 +0000 (17:41 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 4 Jan 2019 17:41:04 +0000 (17:41 +0000)
Change-Id: I2659e2b4884e02628110c3687393d23b5a026c2d


Trivial merge