[dali_1.2.47] Merge branch 'devel/master' 54/137754/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:21:36 +0000 (11:21 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:21:36 +0000 (11:21 +0100)
Change-Id: Ibe215d76eb91247d36639129f50beadc071877fc


Trivial merge