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


Trivial merge