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


Trivial merge