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


Trivial merge