[dali_1.3.47] Merge branch 'devel/master' 95/191995/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:25:13 +0000 (12:25 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 Oct 2018 11:25:13 +0000 (12:25 +0100)
Change-Id: If12618ebc55f39fabbf9635e21b2df53181a33f8


Trivial merge