[dali_1.2.51] Merge branch 'devel/master' 91/142591/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:26 +0000 (11:44 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:26 +0000 (11:44 +0100)
Change-Id: I3de0c71b7d91e0eaa13f619dc54d5caf2d83645b


Trivial merge