From: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Date: Wed, 15 Mar 2017 21:25:09 +0000 (+0000)
Subject: merge from v1.1
X-Git-Tag: v2.0.0~36
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f469e3d5d6173674ffdc723e14b9c277c962539e;hp=-c;p=osm%2FSO.git

merge from v1.1

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
---

f469e3d5d6173674ffdc723e14b9c277c962539e