Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI