tree bcc441f916095b4ee2bb6d8b893e57c4013016dd
parent 7748828000f3dcc968b2c97c5211c1372d9c82b3
parent 330ebb0b5850055c6e9f993340e588198c104ce4
author garciadeblas <gerardo.garciadeblas@telefonica.com> 1549030203 +0100
committer garciadeblas <gerardo.garciadeblas@telefonica.com> 1549030203 +0100

Merge 'origin/master' into v5.0

Change-Id: Ic95c9efe0f67db8b3659c71ad88c42c33ae93015