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


Trivial merge