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


Trivial merge