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


Trivial merge