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


Trivial merge