Merge branch 'master' of https://osm.etsi.org/gerrit/osm/RO
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 13 Jul 2016 23:03:26 +0000 (01:03 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 13 Jul 2016 23:03:26 +0000 (01:03 +0200)

Trivial merge