Merge branch 'master' into v1.0

Change-Id: I28c3c3aa0fd936afdb610632836dee9b07f94b08
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>