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-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=b882ecd7bca6965de18bca855d54f699131da34d

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

b882ecd7bca6965de18bca855d54f699131da34d