[dali_1.2.39] Merge branch 'devel/master' 47/129047/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:03 +0000 (13:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:03 +0000 (13:43 +0100)
Change-Id: Ie6a8e357ae32a0ce4fad1d377dd02201bd9f9b18


Trivial merge