[dali_1.1.43] Merge branch 'devel/master' 63/80263/1
authorDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:27:42 +0000 (12:27 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:27:42 +0000 (12:27 +0100)
Change-Id: I63d5abdbd021af089c27af4e58ab878a49009c3a


Trivial merge