[dali_1.2.58] Merge branch 'devel/master' 83/151983/1
authorDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:23 +0000 (15:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 22 Sep 2017 14:24:23 +0000 (15:24 +0100)
Change-Id: Id334177fba91cb82fc140e5c861c2978eb920219


Trivial merge