Merge 'origin/master' into v5.0 70/7170/1 v5.0.3
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 1 Feb 2019 14:10:03 +0000 (15:10 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 1 Feb 2019 14:10:03 +0000 (15:10 +0100)
commitf84e23b81ae339fe22246a4889157d3b4496c605
treebcc441f916095b4ee2bb6d8b893e57c4013016dd
parent7748828000f3dcc968b2c97c5211c1372d9c82b3
parent330ebb0b5850055c6e9f993340e588198c104ce4
Merge 'origin/master' into v5.0

Change-Id: Ic95c9efe0f67db8b3659c71ad88c42c33ae93015