[dali_1.2.43] Merge branch 'devel/master' 89/133289/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:50:16 +0000 (13:50 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:50:16 +0000 (13:50 +0100)
Change-Id: I005986db4bcae83d205aaf5b37dc1096476e076e


Trivial merge