[dali_1.2.11] Merge branch 'devel/master' 18/93318/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:50 +0000 (15:09 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:50 +0000 (15:09 +0100)
Change-Id: Id16261260dfdcb426a608977fb04729c75bba74c


Trivial merge