[dali_1.3.1] Merge branch 'devel/master' 30/161630/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:56:25 +0000 (11:56 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:56:25 +0000 (11:56 +0000)
Change-Id: I53b964f52cf93858e7d4306d00e8b9e73bcfe384


Trivial merge