[dali_1.3.4] Merge branch 'devel/master' 37/164137/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:24 +0000 (11:19 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:24 +0000 (11:19 +0000)
Change-Id: I109efd16241c715de9bdb0846ee40427b0a5154a


Trivial merge