Merge branch 'v2.0' tag 'v2.0.2' 33/2033/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 14 Jul 2017 11:55:20 +0000 (13:55 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 14 Jul 2017 11:55:49 +0000 (13:55 +0200)
Change-Id: I954c46fb8d89e9d95e026102584377381012fd1b
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge