Merge v1.0 branch into master 84/684/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 18 Nov 2016 09:19:55 +0000 (10:19 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 18 Nov 2016 11:22:05 +0000 (11:22 +0000)
Change-Id: I4389f650b72404b6d75087a3865254bc2781c5c2
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge