From: Anderson Bravalheri <a.bravalheri@bristol.ac.uk>
Date: Wed, 28 Nov 2018 17:21:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into gerrit-submission
X-Git-Tag: v5.0.1~1^2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c5293def02d95ed4ee086dd8842437b76ec05c4e;hp=c5293def02d95ed4ee086dd8842437b76ec05c4e;p=osm%2FRO.git

Merge remote-tracking branch 'upstream/master' into gerrit-submission

Sync with master branch

Change-Id: Ic26d043a84f50f48eeebffb512ccea2eedc053a4
Signed-off-by: Anderson Bravalheri <a.bravalheri@bristol.ac.uk>
---