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


Trivial merge