[dali_1.3.46] Merge branch 'devel/master' 79/191579/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 18 Oct 2018 13:27:32 +0000 (14:27 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 18 Oct 2018 13:27:32 +0000 (14:27 +0100)
Change-Id: Ifc005a47542cd18c50d2ab3af8b816f915f634fe


Trivial merge