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


Trivial merge