[dali_1.3.27] Merge branch 'devel/master' 43/180743/1
authorDavid Steele <david.steele@samsung.com>
Fri, 1 Jun 2018 13:16:47 +0000 (14:16 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 1 Jun 2018 13:16:47 +0000 (14:16 +0100)
Change-Id: Id3b49ed55d02c6670b796b3e33ca2dea899ae5cc


Trivial merge