[dali_1.2.22] Merge branch 'devel/master' 96/110296/1
authorDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:22 +0000 (14:36 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:22 +0000 (14:36 +0000)
Change-Id: Idb89b98633fd8f1f8939c9e2d29050b122f8b2f7


Trivial merge