Merge branch v1.0 (commit fb1987b) into master 90/690/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 21 Nov 2016 13:58:05 +0000 (14:58 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 21 Nov 2016 14:05:28 +0000 (15:05 +0100)
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge