[dali_1.2.40] Merge branch 'devel/master' 29/130229/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:43:54 +0000 (13:43 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:43:54 +0000 (13:43 +0100)
Change-Id: I8d45353a19b8f0ae86be178a2325a04e0b8beab1


Trivial merge