[dali_1.3.45] Merge branch 'devel/master' 13/191213/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 Oct 2018 12:38:33 +0000 (13:38 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 Oct 2018 12:38:33 +0000 (13:38 +0100)
Change-Id: Ia5bb5e0ffff7147550a44a25a98482acaeb212a1


Trivial merge