[dali_1.3.3] Merge branch 'devel/master' 38/163338/1
authorDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:33:49 +0000 (14:33 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:33:49 +0000 (14:33 +0000)
Change-Id: I15f939dc658533cd8149a2e163865df82fc1c099


Trivial merge