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


Trivial merge