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


Trivial merge