[dali_1.2.11] Merge branch 'devel/master' 19/93319/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:10:04 +0000 (15:10 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:10:04 +0000 (15:10 +0100)
Change-Id: I346006b79d13c0012d9a5c8fa86e524a22dc012b


Trivial merge