[dali_1.3.37] Merge branch 'devel/master' 54/187054/1
authorthothamon <jason.perry@partner.samsung.com>
Fri, 17 Aug 2018 11:16:49 +0000 (12:16 +0100)
committerthothamon <jason.perry@partner.samsung.com>
Fri, 17 Aug 2018 11:16:49 +0000 (12:16 +0100)
Change-Id: I13f4469f520394a981ee93c990988d8bdfc9c750


Trivial merge