[dali_1.2.59] Merge branch 'devel/master' 89/153789/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 29 Sep 2017 12:19:51 +0000 (13:19 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 29 Sep 2017 12:19:51 +0000 (13:19 +0100)
Change-Id: I8eefabdc91876fd5a5c309411ecba6bfc592c6ab


Trivial merge