[dali_1.2.57] Merge branch 'devel/master' 97/150397/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:42 +0000 (11:10 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:42 +0000 (11:10 +0100)
Change-Id: I759c90d60a5731db47ce420b7da013157ad63da5


Trivial merge