[dali_1.2.34] Merge branch 'devel/master' 99/123899/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:12:22 +0000 (11:12 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:12:22 +0000 (11:12 +0100)
Change-Id: If44623378fd40e4b8efcabc396391a13c5e4e6d2


Trivial merge