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


Trivial merge