[dali_1.2.7] Merge branch 'devel/master' 50/89450/1
authorDavid Steele <david.steele@partner.samsung.com>
Fri, 23 Sep 2016 12:58:14 +0000 (13:58 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Fri, 23 Sep 2016 12:58:14 +0000 (13:58 +0100)
Change-Id: I9efc857ec2d1602ab762a9951b0a2f3bb7154977


Trivial merge