tree 45e0374d28618f521803a31e7abd804d7f26b50f
parent f2dc2462571800e62cba969964de621dca09299c
author Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com> 1506822164 -0400
committer Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com> 1506980621 -0400

update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b third try

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

Change-Id: Ib11aa03a2eff5a53c808342508a5d7bee7b202b8