[dali_1.2.63] Merge branch 'devel/master' 55/158055/1
authorUmar <m.umar@partner.samsung.com>
Fri, 27 Oct 2017 11:12:20 +0000 (12:12 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 27 Oct 2017 11:12:20 +0000 (12:12 +0100)
Change-Id: Ibcd4c26f16c32f32af29e1288a5654fb6c78f05b


Trivial merge