[dali_1.3.33] Merge branch 'devel/master' 33/184733/1
authorAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:54 +0000 (13:31 +0100)
committerAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:54 +0000 (13:31 +0100)
Change-Id: Iefab1200a2bd64a89316ff1550c2b81051018647


Trivial merge