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


Trivial merge