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


Trivial merge