From: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Date: Mon, 1 May 2017 15:24:26 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/v2.0'
X-Git-Tag: v2.0.1~14^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=a27b51d71318058e22f9a24364b4b02212738b26;p=osm%2FUI.git

Merge remote-tracking branch 'origin/v2.0'
---

a27b51d71318058e22f9a24364b4b02212738b26