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


Trivial merge