[dali_1.2.1] Merge branch 'devel/master' 50/83850/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:36 +0000 (11:41 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:36 +0000 (11:41 +0100)
Change-Id: I911142b201fcc91fecf8554c9dd441a706103ebe


Trivial merge