[dali_1.3.1] Merge branch 'devel/master' 48/161648/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:57:02 +0000 (11:57 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:57:02 +0000 (11:57 +0000)
Change-Id: I120eac7ba19538802415d1099d12954999b3d367


Trivial merge