Merge branch 'master' into netslice 84/6584/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 28 Sep 2018 10:13:44 +0000 (12:13 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 28 Sep 2018 10:13:44 +0000 (12:13 +0200)

Trivial merge