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


Trivial merge