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


Trivial merge