[dali_1.3.21] Merge branch 'devel/master' 58/176658/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:58:38 +0000 (11:58 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:58:38 +0000 (11:58 +0100)
Change-Id: I9291712a30ab1f19b7c0324bbe2160bba405a83d


Trivial merge