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


Trivial merge