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


Trivial merge