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


Trivial merge