[dali_1.3.34] Merge branch 'devel/master' 15/185315/1
authorDavid Steele <david.steele@samsung.com>
Fri, 27 Jul 2018 11:43:12 +0000 (12:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 27 Jul 2018 11:43:12 +0000 (12:43 +0100)
Change-Id: I3b2acaccbd6356561c2d377f658c8c23f0510ffd


Trivial merge