[dali_1.3.14] Merge branch 'devel/master' 11/171411/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:51:56 +0000 (11:51 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:51:56 +0000 (11:51 +0000)
Change-Id: Ib1e147778bb2137bcb0f0293ff01245058cd5c7a


Trivial merge