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


Trivial merge