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


Trivial merge