[dali_1.2.40] Merge branch 'devel/master' 31/130231/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:44:14 +0000 (13:44 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:44:14 +0000 (13:44 +0100)
Change-Id: I1f0451276501e19b07c4805f45b7241b03887c2d


Trivial merge