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


Trivial merge