[dali_1.3.50] Merge branch 'devel/master' 56/193256/1
authoradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:21:50 +0000 (12:21 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:21:50 +0000 (12:21 +0000)
Change-Id: I6ba621de65bbdad71f34b9933124ae6f686552f2


Trivial merge