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


Trivial merge