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


Trivial merge