[dali_1.2.44] Merge branch 'devel/master' 38/134438/1
authorUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 11:04:40 +0000 (12:04 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 16 Jun 2017 11:04:40 +0000 (12:04 +0100)
Change-Id: Ia7b8bf4e8970237d4ccae7de8adec71cd348877d


Trivial merge