[dali_1.2.49] Merge branch 'devel/master' 55/140055/1
authorDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:25:18 +0000 (14:25 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:25:18 +0000 (14:25 +0100)
Change-Id: I7f3cf6dc4fbbac8de9b8af584f545bc17368e81d


Trivial merge