[dali_1.2.59] Merge branch 'devel/master' 91/153791/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 29 Sep 2017 12:20:15 +0000 (13:20 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 29 Sep 2017 12:20:15 +0000 (13:20 +0100)
Change-Id: I655a1a5b9abfab418daefabe1e7158a24574bae2


Trivial merge