Merge w/ upstream

To update this fork!