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

Trivial merge