[dali_1.2.39] Merge branch 'devel/master' 46/129046/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:42:48 +0000 (13:42 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:42:48 +0000 (13:42 +0100)
Change-Id: I8c4b1ead08e53e83a120917973993bf88ece81f7


Trivial merge