[dali_1.2.49] Merge branch 'devel/master' 53/140053/1
authorDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:24:57 +0000 (14:24 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:24:57 +0000 (14:24 +0100)
Change-Id: I55721d9973e8ca0ff945c81696b0259f90b4a2d6


Trivial merge