merge v1.0.2 -commit 8940f6c- into master

Change-Id: Iecc046a8c277b66c11037376b2ce3a821049be2a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>