[dali_1.1.35] Merge branch 'devel/master' 54/70754/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:17:57 +0000 (11:17 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:17:57 +0000 (11:17 +0100)
Change-Id: I30c09eb9c733f3eeb02ec9cabc5e48c86840897c


Trivial merge