[dali_1.9.30] Merge branch 'devel/master' 45/244445/1
authorDavid Steele <david.steele@ws-1747.seri.co.uk>
Fri, 18 Sep 2020 10:35:39 +0000 (11:35 +0100)
committerDavid Steele <david.steele@ws-1747.seri.co.uk>
Fri, 18 Sep 2020 10:35:39 +0000 (11:35 +0100)
Change-Id: I5c110e9125f1eb27c6d9b2a3f445c9d89f91d3b8


Trivial merge