[dali_1.2.44] Merge branch 'devel/master' 36/134436/1
authorUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 11:04:19 +0000 (12:04 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 11:04:19 +0000 (12:04 +0100)
Change-Id: I83c807795b23344446025337b1297bfe69f11eaf


Trivial merge