[dali_1.3.31] Merge branch 'devel/master' 41/183541/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:38 +0000 (10:37 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:38 +0000 (10:37 +0100)
Change-Id: I59d87de13a7bc4a8f69dc75f2b5e07687638b39e


Trivial merge