merge v1.0 commit 9aea043 on master 48/748/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Tue, 29 Nov 2016 17:14:19 +0000 (18:14 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Tue, 29 Nov 2016 17:15:29 +0000 (18:15 +0100)
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge