[dali_1.2.61] Merge branch 'devel/master' 70/155570/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:55 +0000 (15:00 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:55 +0000 (15:00 +0100)
Change-Id: I160a9cde85c40723834dea23fdf0288a672c629c


Trivial merge