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)
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge