[dali_1.2.38] Merge branch 'devel/master' 95/128095/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:59 +0000 (10:52 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:59 +0000 (10:52 +0100)
Change-Id: I6695ac39d875d5f26f677855560ab673b04c262f


Trivial merge