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


Trivial merge