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


Trivial merge