[dali_1.2.1] Merge branch 'devel/master' 51/83851/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:44 +0000 (11:41 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:44 +0000 (11:41 +0100)
Change-Id: I88921df2ca55707305dc7aa616106566b5a67d6d


Trivial merge