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


Trivial merge