[dali_1.4.14] Merge branch 'devel/master' 83/202883/1
authoradam.b <adam.b@samsung.com>
Fri, 5 Apr 2019 10:51:39 +0000 (11:51 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 5 Apr 2019 10:51:39 +0000 (11:51 +0100)
Change-Id: Ib85f7efef879ebb87ec07c58403da8824b6f975c


Trivial merge