[dali_1.3.43] Merge branch 'devel/master' 69/190269/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 28 Sep 2018 13:06:05 +0000 (14:06 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 28 Sep 2018 13:06:05 +0000 (14:06 +0100)
Change-Id: If0e996389956ebc4e030558dd47cb13d0f517624


Trivial merge