[dali_1.3.42] Merge branch 'devel/master' 83/189883/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Sep 2018 09:19:05 +0000 (10:19 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Sep 2018 09:19:05 +0000 (10:19 +0100)
Change-Id: I1ea19c5266fbcea96872789f395fbddc75e95502


Trivial merge