[dali_1.3.26] Merge branch 'devel/master' 76/180076/1
authorthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:19:21 +0000 (14:19 +0100)
committerthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:19:21 +0000 (14:19 +0100)
Change-Id: If8a918599fe083be548df9943798e6e98a71750e


Trivial merge