[dali_1.2.17] Merge branch 'devel/master' 82/101982/1
authoradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:17 +0000 (14:08 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 2 Dec 2016 14:08:17 +0000 (14:08 +0000)
Change-Id: I5f09307275a25fc1cce304ce9856570933a72546


Trivial merge