[dali_1.2.54] Merge branch 'devel/master' 48/146248/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:26 +0000 (11:49 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 25 Aug 2017 10:49:26 +0000 (11:49 +0100)
Change-Id: I584917fd6f5c31847b9ca29873256680ff6aa3a8


Trivial merge