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)
commite36fcf1de3aa198c2c931c591db3859c09941347
tree86a0fa5fdc2245964453819b01e132b251e9d967
parent68ba243af24d8bd4869cb742287ce155aca1b323
parent90c193a4eeb12bb50f4be33b167036954a6c7546
merge from v1.1

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