[dali_1.2.42] Merge branch 'devel/master' 63/132363/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:33 +0000 (12:56 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:33 +0000 (12:56 +0100)
Change-Id: Iee4b624e159ad90653e6eb602ee0da0187db4054


Trivial merge