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


Trivial merge