[dali_1.4.39] Merge branch 'devel/master' 94/214894/1
authoradam.b <adam.b@samsung.com>
Fri, 27 Sep 2019 09:17:11 +0000 (10:17 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 27 Sep 2019 09:17:11 +0000 (10:17 +0100)
Change-Id: If73fdf96d220dc5d1ce9d9267b65d43a2d5847b5


Trivial merge