[dali_1.9.36] Merge branch 'devel/master' 39/246539/1
authorDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:41 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 30 Oct 2020 14:34:41 +0000 (14:34 +0000)
Change-Id: I62adeb6088f77ab8e6728cf0cb2b3553aec37e35


Trivial merge