merge v1.0.2 -commit b1c42b6- into master 13/813/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:46:09 +0000 (18:46 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:46:56 +0000 (18:46 +0100)
Change-Id: Iec0283ef28a4407b72439b894e0f618ee54ac1d5
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge