[dali_1.3.3] Merge branch 'devel/master' 40/163340/1
authorDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:34:09 +0000 (14:34 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 8 Dec 2017 14:34:09 +0000 (14:34 +0000)
Change-Id: Idb2ca961f0f0c030b0018cac31ff72a8891ba47d


Trivial merge