[dali_1.3.41] Merge branch 'devel/master' 57/189257/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Sep 2018 14:22:02 +0000 (15:22 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Sep 2018 14:22:02 +0000 (15:22 +0100)
Change-Id: Ib453415690045cadaab7f52d71407cad6263cb85


Trivial merge