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


Trivial merge