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


Trivial merge