Fixed bug
Merge branch 'develop' into bug/224
CHANGES_NEXT_RELEASE updated
Merge pull request #229 from telefonicaid/bug/224

Bug/224