[dali_1.3.27] Merge branch 'devel/master' 45/180745/1
authorDavid Steele <david.steele@samsung.com>
Fri, 1 Jun 2018 13:17:10 +0000 (14:17 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 1 Jun 2018 13:17:10 +0000 (14:17 +0100)
Change-Id: I1b2d0d345987fc408f597c5af1d5a659a70ea4db


Trivial merge