Merge "Merge v1.0 branch into master"
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 21 Nov 2016 10:42:09 +0000 (11:42 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Mon, 21 Nov 2016 10:42:09 +0000 (11:42 +0100)

Trivial merge