[dali_1.3.50] Merge branch 'devel/master' 59/193259/1
authoradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:14 +0000 (12:22 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:14 +0000 (12:22 +0000)
Change-Id: Iede0decea55feae95e0ddef6cd1a70cf2e4b9825


Trivial merge