[dali_1.2.8] Merge branch 'devel/master' 84/90584/1
authoradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:46 +0000 (15:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:46 +0000 (15:12 +0100)
Change-Id: I826ef82f07f246258b07c9479f00aaf6200c8c7a


Trivial merge