merge from v1.1
authorJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Wed, 15 Mar 2017 21:25:09 +0000 (21:25 +0000)
committerJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Wed, 15 Mar 2017 21:25:09 +0000 (21:25 +0000)
commitf469e3d5d6173674ffdc723e14b9c277c962539e
tree86a0fa5fdc2245964453819b01e132b251e9d967
parent92a48e9f266789c86274788d12334d05c8bcab82
parent1e7e312528ebeedf478aefd0e7317b56c119cc1c
merge from v1.1

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