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


Trivial merge