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


Trivial merge