tree 0a495a81e5150578976288ae9c302660d633c4a3
parent 6f1a3fe149e4a6b9803382cb299c902f4cf58ec9
author Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com> 1506817713 -0400
committer Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com> 1506817713 -0400

update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try

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