[dali_1.3.41] Merge branch 'devel/master' 51/189251/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Sep 2018 14:21:29 +0000 (15:21 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Sep 2018 14:21:29 +0000 (15:21 +0100)
Change-Id: I3175b3d818c7bce1cd11d6bda6d9232cc5d2c878


Trivial merge