Merge branch 'feature628' 05/1605/2
authortierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 20 Apr 2017 15:56:27 +0000 (17:56 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 20 Apr 2017 16:52:35 +0000 (17:52 +0100)
commitae3fa6137b603b4d6b44e8c7897427a7e535b2a7
treedd5b3d85d0147af2bdc9fe68c700c9abcfecf920
parentc53ebfa243b7cafadfd3526d8d8505b2ae10494b
parentf2bd1e8213980857708095f43149c5acc1dc5408
Merge branch 'feature628'

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>