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


Trivial merge