[dali_1.2.41] Merge branch 'devel/master' 50/131350/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:40 +0000 (13:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:40 +0000 (13:31 +0100)
Change-Id: Ia8f3460be6c1849464993b88402916d5707557c3


Trivial merge