Merge branch 'master' into netslice 64/6864/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 7 Nov 2018 04:32:41 +0000 (05:32 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 7 Nov 2018 04:32:41 +0000 (05:32 +0100)

Trivial merge