[dali_1.2.39] Merge branch 'devel/master' 49/129049/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:25 +0000 (13:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:25 +0000 (13:43 +0100)
Change-Id: I1dc9751c9631376e030c7376adee6092ada4e9e7


Trivial merge