[dali_1.9.24] Merge branch 'devel/master' 77/240577/1
authorDavid Steele <david.steele@ws-1737.seri.co.uk>
Fri, 7 Aug 2020 14:42:50 +0000 (15:42 +0100)
committerDavid Steele <david.steele@ws-1737.seri.co.uk>
Fri, 7 Aug 2020 14:42:50 +0000 (15:42 +0100)
Change-Id: I913bd340af39a1f7c723697344d1f60cdce1e61d


Trivial merge