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


Trivial merge