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


Trivial merge