[dali_1.3.13] Merge branch 'devel/master' 65/170965/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 23 Feb 2018 13:29:18 +0000 (13:29 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 23 Feb 2018 13:29:18 +0000 (13:29 +0000)
Change-Id: Iad330e5b139dbbee1c124d5e277c1bab650f31cb


Trivial merge