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


Trivial merge