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


Trivial merge