[dali_1.2.24] Merge branch 'devel/master' 08/112208/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:18 +0000 (15:15 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:18 +0000 (15:15 +0000)
Change-Id: Ie408dac3d6e61874acd05580274602687cc00f1f


Trivial merge