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


Trivial merge