[dali_1.2.55] Merge branch 'devel/master' 20/147220/1
authorUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:12 +0000 (12:36 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:12 +0000 (12:36 +0100)
Change-Id: I0527eda1f54bb786913b1e1dfc6a72f2c6b66740


Trivial merge