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


Trivial merge