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


Trivial merge