merge v1.0.2 -commit 8940f6c- into master 14/814/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:50:49 +0000 (18:50 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:51:11 +0000 (18:51 +0100)
Change-Id: Iecc046a8c277b66c11037376b2ce3a821049be2a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge