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


Trivial merge