[dali_1.3.24] Merge branch 'devel/master' 97/178597/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:56:35 +0000 (15:56 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 10 May 2018 14:56:35 +0000 (15:56 +0100)
Change-Id: I754a2beaa18ada7c853cc16f51f667315ce1c69e


Trivial merge