Merge branch 'WIM' into master 28/7028/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 3 Dec 2018 17:51:26 +0000 (18:51 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 3 Dec 2018 17:51:47 +0000 (18:51 +0100)
Change-Id: Ibef33c7dfcf3c40dbdf278fc160907675ffbeb03
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge