[dali_1.3.1] Merge branch 'devel/master' 31/161631/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:56:40 +0000 (11:56 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:56:40 +0000 (11:56 +0000)
Change-Id: I5a4f4c4e75614216d8bb6904d56fdff9625e6ab3


Trivial merge