From: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Date: Fri, 23 Dec 2016 21:18:00 +0000 (-0500)
Subject: merge from v1.0
X-Git-Tag: v1.1.0~33
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c33673480c15d6e64402b547563640b2025a3cd6;hp=--cc;p=osm%2FSO.git

merge from v1.0

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

c33673480c15d6e64402b547563640b2025a3cd6