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


Trivial merge